This repository has been archived by the owner on Jan 5, 2024. It is now read-only.
Separate print, USB export related actions into their own classes #41
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Two things that could be followups would be:
- see if we can make
SDExport.exit_gracefullymore standalone: I ended up not making autils.pyas theexit_gracefullymethod is used almost everywhere, and part of its cleanup is removing the submission's tmpdir. So I'd either need to passtmpdiraround everywhere, which is messy, or just leave it as a method onSDExport, which is what I elected to do for now. The fact this is used so widely is also what complicated removing thesubmissionfrom the test actions.
I agree that the preflight check Actions and PrintTestPageAction should not require a submission object. It seems like it makes more sense for there to be a Printer object with printer_uri etc that you can pass to printer Actions, and a DiskDrive object that you pass to disk transfer actions. I think it would make sense to create a followup discussion issue.
- combining usb-test and disk-test: I didn't do that here as I wanted to keep the inter-VM interface the same (i.e. no changes are needed in
securedrop-clientto merge this) but I think this would make sense to do.
I agree with this followup.
✔️ I made sure I could still print a file from a LaserJet Pro M404n printer and transfer a file to a usb disk drive.
this is more accurate since there are no _strict_ USB requirements in the current export code: removable block devices of other kinds can be exported to
|
thanks for the comments! agreed all around, added two commits (and did a quick retest of the USB export... i mean Disk export 😇) |
This was referenced Dec 13, 2023
9 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #33, breaks up the
SDExportclass, we now have:SDExport(same name) which contains submission archive related information and helper methods, like the niceMetadataobject that was already on master*Actionobjects, one for each type of export we support, which contain methods/attributes related to the export action in question. Each export action must implementrun().Two things that could be followups would be:
SDExport.exit_gracefullymore standalone: I ended up not making autils.pyas theexit_gracefullymethod is used almost everywhere, and part of its cleanup is removing the submission's tmpdir. So I'd either need to passtmpdiraround everywhere, which is messy, or just leave it as a method onSDExport, which is what I elected to do for now. The fact this is used so widely is also what complicated removing thesubmissionfrom the test actions.securedrop-clientto merge this) but I think this would make sense to do.Since I'm moving around the furniture, feel free to let me know if you don't like where things are @emkll & @creviera :-)
Test plan
I have tested the following with my HP LaserJet and a USB drive: